bitkeeper revision 1.1109 (40fba255_6K-mdDlFfWu0qHz1y5yEg)
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Mon, 19 Jul 2004 10:28:37 +0000 (10:28 +0000)
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Mon, 19 Jul 2004 10:28:37 +0000 (10:28 +0000)
commitaa806c54e500df011ee9e2b343a9c734bae2c46f
tree0224ecb5f79c82f3c03932333c052bf849b0020e
parente17fa59f091dec17caa1b3a31625bd34aeef9ae4
parent5ecc8cea0e3eb724831d100c501b0e3282933987
bitkeeper revision 1.1109 (40fba255_6K-mdDlFfWu0qHz1y5yEg)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/local/scratch/cl349/xeno.bk-ptrw
xen/arch/x86/memory.c
xen/arch/x86/traps.c
xen/include/asm-x86/mm.h